merge with xen-unstable.hg staging
authorAlex Williamson <alex.williamson@hp.com>
Fri, 18 Jan 2008 20:49:48 +0000 (13:49 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 18 Jan 2008 20:49:48 +0000 (13:49 -0700)

Trivial merge